Correct handling of StgDict/StgInfo for Structure return types #446
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgelessus
requested changes
Apr 16, 2024
src/rubicon/objc/ctypes_patch.py
Outdated
|
|
||
| # The StgDictObject structure from "Modules/_ctypes/ctypes.h". This structure is | ||
| # not officially stable across Python versions, but it didn't change between being | ||
| # introduced in 2009, and being replaced in 2004/Python 3.13.0a6. |
There was a problem hiding this comment.
Suggested change
| # introduced in 2009, and being replaced in 2004/Python 3.13.0a6. | |
| # introduced in 2009, and being replaced in 2024/Python 3.13.0a6. |
src/rubicon/objc/ctypes_patch.py
Outdated
| raise TypeError( | ||
| f"Expected a type object, not {type(tp).__module__}.{type(tp).__qualname__}" | ||
| ) | ||
| return StgInfo.from_address(id(tp) + py_type_type.tp_basicsize) |
There was a problem hiding this comment.
Can we use the proper PyObject_GetTypeData function for this? It's declared in object.h and is part of the public C API, so unlike the ctypes-internal functions, we don't need to reimplement this one ourselves.
There was a problem hiding this comment.
After obtaining the StgInfo, we should also check that its initialized field is non-zero, like the real code in CPython does.
|
I'm not familiar with this area, so I'll leave the reviewing to others. |
samschott
reviewed
Apr 16, 2024
There was a problem hiding this comment.
Thanks for the fix, and the very well documented code! Pending the requested changes by @dgelessus, this looks good to me.
samschott
requested changes
Apr 17, 2024
samschott
approved these changes
Apr 18, 2024
|
@dgelessus Are you OK with this updated version? |
dgelessus
approved these changes
Apr 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #444.
python/cpython#114314 replaced the StgDict structure with StgInfo; this has been released in Python 3.13.0a6.
The real fix for this is to address this upstream, rather than requiring us to work around ctypes; but:
Although the patch looks like a lot of code, most of the delta is actually a re-org so that the older code will be auto removed when Py3.13 is the oldest supported version.
As a test, I've also run the full Toga testbed on macOS with this code and it worked as expected.
PR Checklist: